Revision: bazaar--devel--1.1--patch-52
Archive: robert.collins@canonical.com--general
Creator: Robert Collins <robert.collins@canonical.com>
Date: Fri Dec 17 22:20:58 EST 2004
Standard-date: 2004-12-17 11:20:58 GMT
Renamed-files: commands/star-merge.c commands/merge.c
    commands/star-merge.h commands/merge.h
    tests/test-star-merge.sh tests/test-merge.sh
Modified-files: commands/cmds.c commands/merge.c
    commands/merge.h libarch/merge-points.c
    libarch/merge-points.h libarch/patch-logs.c
    libarch/patch-logs.h libarch/star-merge.c
    libarch/star-merge.h libawk/associative.c
    libawk/associative.h libawk/relational.h
    tests/Makefile.in
    tests/jane-and-foo-do-hello-world-1-baz.sh
    tests/jane-and-foo-do-hello-world-1.sh
    tests/jane-and-foo-do-hello-world-2.sh
    tests/test-merge.sh tests/test-tag.sh
    tests/test-tree-version.sh
New-patches: robert.collins@canonical.com--general/bazaar--devel--1.1--patch-52
    robert.collins@canonical.com--general/bazaar--merge--1.1--patch-4
    robert.collins@canonical.com--general/bazaar--merge--1.1--patch-5
    robert.collins@canonical.com--general/bazaar--merge--1.1--patch-6
    robert.collins@canonical.com--general/bazaar--merge--1.1--patch-7
    robert.collins@canonical.com--general/bazaar--merge--1.1--patch-8
    robert.collins@canonical.com--general/bazaar--merge--1.1--patch-9
    robert.collins@canonical.com--general/bazaar--merge--1.1--patch-10
    robert.collins@canonical.com--general/bazaar--merge--1.1--patch-11
    robert.collins@canonical.com--general/bazaar--merge--1.1--patch-12
    robert.collins@canonical.com--general/bazaar--merge--1.1--patch-13
    robert.collins@canonical.com--general/bazaar--merge--1.1--patch-14
    thelove@canonical.com/bazaar--devo--1.1--patch-62
    thelove@canonical.com/bazaar--devo--1.1--patch-63
Summary: merge from rf
Keywords: 

Patches applied:

 * robert.collins@canonical.com--general/bazaar--merge--1.1--patch-4
   first cut graph merge operator in star-merge. leaky, but optimiseable

 * robert.collins@canonical.com--general/bazaar--merge--1.1--patch-5
   remove unneeded join-branches

 * robert.collins@canonical.com--general/bazaar--merge--1.1--patch-6
   implement basic trace functionality for merge.

 * robert.collins@canonical.com--general/bazaar--merge--1.1--patch-7
   change smart merge algorithm to generate minimum depth intersection of patch logs

 * robert.collins@canonical.com--general/bazaar--merge--1.1--patch-8
   teach merge to really use one of the best merge parents

 * robert.collins@canonical.com--general/bazaar--merge--1.1--patch-9
   rename star-merge to merge

 * robert.collins@canonical.com--general/bazaar--merge--1.1--patch-10
   remove a non needed helper function

 * robert.collins@canonical.com--general/bazaar--merge--1.1--patch-11
   code cleanups for star-merge.c

 * robert.collins@canonical.com--general/bazaar--merge--1.1--patch-12
   begin per-tree patch looks for uncommitted merges, and fix handling trimed patches

 * robert.collins@canonical.com--general/bazaar--merge--1.1--patch-13
   merge from thelove@canonical.com/bazaar--devel--1.1

 * robert.collins@canonical.com--general/bazaar--merge--1.1--patch-14
   merge from the current state of the 'this' tree, not the last committed state

 * thelove@canonical.com/bazaar--devo--1.1--patch-62
   new merge algorithm that deals with tags and cycles more sanely that star-merge

 * thelove@canonical.com/bazaar--devo--1.1--patch-63
   Merge in latest translations : Catalan, Chinese, Danish, Dutch, Frence, Portuguese, Spanish

